From: Paul Eggert Date: Fri, 14 Jan 2011 05:07:26 +0000 (-0800) Subject: Merge from mainline. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5157^2~12 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7890564d5a1211251e209fd9cf375519d8e39c81;p=emacs.git Merge from mainline. --- 7890564d5a1211251e209fd9cf375519d8e39c81 diff --cc admin/ChangeLog index 0e0d9f2e0d2,e0059664aba..e8b2d571ebd --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,14 -1,8 +1,19 @@@ - 2011-01-09 Paul Eggert ++2011-01-14 Paul Eggert + + Update copyright notes to match recent gnulib-related changes. + * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in, + arg-nonnull.h, c++defs.h, compile, depcomp, missing, + warn-on-use.h, lib/*.[ch], lib/gnulib.mk. Remove src/mktime.c, + lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and + are subsumed by the lib/*.[ch] rule). Remove m4/getopt.m4 (now + subsumed by m4/*.m4 rule). config.guess, config.sub, and + doc/man/texinfo.tex are now copied in from gnulib. + + 2011-01-14 Glenn Morris + + * bzrmerge.el: Require cl when compiling. + (bzrmerge-merges): Doc fix. + 2011-01-07 Paul Eggert * notes/copyright: There's only one install-sh, not two, so fix a